Merge "Allow to customise addHelpLink() target via system message"